projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c35997
)
(min, max): Don't define if already defined.
author
Richard M. Stallman
<rms@gnu.org>
Thu, 8 Feb 1996 21:58:53 +0000
(21:58 +0000)
committer
Richard M. Stallman
<rms@gnu.org>
Thu, 8 Feb 1996 21:58:53 +0000
(21:58 +0000)
src/xterm.c
patch
|
blob
|
history
diff --git
a/src/xterm.c
b/src/xterm.c
index 091690e1d1964a01fc6abca4710127231043fbe3..1c22b48e0b70a58a979eb8b904748d539b24924c 100644
(file)
--- a/
src/xterm.c
+++ b/
src/xterm.c
@@
-115,8
+115,12
@@
extern void _XEditResCheckMessages ();
#include <X11/Xlibint.h>
#endif
+#ifndef min
#define min(a,b) ((a)<(b) ? (a) : (b))
+#endif
+#ifndef max
#define max(a,b) ((a)>(b) ? (a) : (b))
+#endif
\f
/* This is a chain of structures for all the X displays currently in use. */
struct x_display_info *x_display_list;